bitkeeper revision 1.1339 (42664beb9pIazYZQ7Q7VrSdT1GCS1w)
authormafetter@fleming.research <mafetter@fleming.research>
Wed, 20 Apr 2005 12:32:43 +0000 (12:32 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Wed, 20 Apr 2005 12:32:43 +0000 (12:32 +0000)
commitc6f46c48dc5fd3acb68a9ac7cf7bc69afbc90a46
tree57b3ad8a3c6339857589053e114cbe9b514fb410
parent983fcb500e57e08bdd0331c285787b0425417cd1
parente3e0d164742ad5bd51d59e64d2eb4d0c28b4f732
bitkeeper revision 1.1339 (42664beb9pIazYZQ7Q7VrSdT1GCS1w)

Hand merge

Signed-off-by: michael.fetterman@cl.cam.ac.uk
xen/arch/x86/domain.c
xen/arch/x86/mm.c
xen/arch/x86/shadow.c
xen/arch/x86/vmx.c
xen/arch/x86/x86_32/mm.c
xen/common/grant_table.c
xen/include/asm-x86/mm.h
xen/include/asm-x86/x86_32/page.h